Scrub initial xenstore page, free xendev structure.

Signed-off-by: Rusty Russel <rusty@rustcorp.com.au>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c
index 67146efea8bf8ace7a43dbb262915fd50abd182b..d402e81f5309dfd241f357f2f9a535e863c6e239 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c
@@ -202,6 +202,9 @@ int xb_init_comms(void **in, void **out)
                return err;
        }
 
+       /* FIXME zero out page -- domain builder should probably do this*/
+       memset((void *)xen_start_info.store_page, 0, PAGE_SIZE);
+
        *out = (void *)xen_start_info.store_page;
        *in = (void *)xen_start_info.store_page + PAGE_SIZE/2;
        return 0;

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
index d3aaa2f1e090b8354bd9ea56e93b74e9dc1f3ec6..abdccc6fb977e871d4008eb6741623320b4c1db9 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
@@ -150,6 +150,16 @@ struct xenbus_device *xenbus_device_find(const char *busid)
        return info.dev;
 }
 
+
+static void xenbus_release_device(struct device *dev)
+{
+       if (dev) {
+               struct xenbus_device *xendev = to_xenbus_device(dev);
+
+               kfree(xendev->subtype);
+               kfree(xendev);
+       }
+}
 /* devices/<typename>/<name> */
 static int xenbus_probe_device(const char *dirpath, const char *devicetype,
                               const char *name)
@@ -176,6 +186,7 @@ static int xenbus_probe_device(const char *dirpath, const char *devicetype,
        /* FIXME: look for "subtype" field. */
        snprintf(xendev->dev.bus_id, BUS_ID_SIZE, "%s-%s", devicetype, name);
        xendev->dev.bus = &xenbus_type;
+       xendev->dev.release = xenbus_release_device;
 
        /* Register with generic device framework. */
        err = device_register(&xendev->dev);